bitkeeper revision 1.1159.1.434 (419cb9a1Yh0c8r0esXLFKN8CAWPevA)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 18 Nov 2004 15:02:57 +0000 (15:02 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Thu, 18 Nov 2004 15:02:57 +0000 (15:02 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xen.bk-smp


Trivial merge